Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20060] Fix data race on writer destruction while sending hearbeat (backport #4076) #4168

Merged
merged 1 commit into from
Dec 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 18, 2023

This is an automatic backport of pull request #4076 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@JesusPoderoso JesusPoderoso added this to the v2.6.7 milestone Dec 18, 2023
@JesusPoderoso JesusPoderoso added the ci-pending PR which CI is running label Dec 18, 2023
@MiguelCompany
Copy link
Member

@richiprosima Please test mac

1 similar comment
@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany
Copy link
Member

@Mergifyio rebase

* Add regression test

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Protect changes release when destroying writer

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Apply suggestions

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Fix warning

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

---------

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
(cherry picked from commit 61e1c6a)
Copy link
Contributor Author

mergify bot commented Dec 24, 2023

rebase

✅ Branch has been successfully rebased

@MiguelCompany
Copy link
Member

@richiprosima Please test this

@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit a8bee80 into 2.6.x Dec 25, 2023
12 of 14 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-4076 branch December 25, 2023 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants